From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 18 Mar 2009 17:30:13 +0000 (+0000)
Subject: ioemu-stubdom: Use xen-setup-stubdom rather than configure
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=4b031bb5b7bc277a85521eaf4c11adde5dce719f;p=xen.git

ioemu-stubdom: Use xen-setup-stubdom rather than configure

xen-setup runs the upstream configure script, and ends up
autodetecting various properties of the host and then trying to use
them in stubdom, which works badly.

In commit c609854fe18aab3216f28e1e5291b75970d398d5 in
qemu-xen-unstable we provide a new `xen-setup-stubdom' script, which
hardcodes the relevant answers.

With these two changes, stubdom should compile again.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 01b6e02d08..39872189ca 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -7,8 +7,6 @@ export stubdom=y
 export debug=y
 include $(XEN_ROOT)/Config.mk
 
-IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu --disable-vde
-
 #ZLIB_URL?=http://www.zlib.net
 ZLIB_URL=$(XEN_EXTFILES_URL)
 ZLIB_VERSION=1.2.3
@@ -237,8 +235,12 @@ ioemu: cross-zlib cross-libpci libxc
 	[ -f ioemu/config-host.mak ] || \
 	  ( $(absolutify_xen_root); \
 	    cd ioemu ; \
-          CONFIG_STUBDOM=yes XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS))
-	CPPFLAGS= TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= CONFIG_STUBDOM=yes
+	    LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \
+	    TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	    TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+	    TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
+	    ./xen-setup-stubdom )
+	$(MAKE) -C ioemu
 
 ######
 # caml